Merge branch 'master' of https://github.com/gpsbabel/gpsbabel
authorRobert Lipe <robertlipe@gpsbabel.org>
Mon, 22 Aug 2016 17:13:20 +0000 (12:13 -0500)
committerRobert Lipe <robertlipe@gpsbabel.org>
Mon, 22 Aug 2016 17:13:20 +0000 (12:13 -0500)

Trivial merge